]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
telepathyClient: Don't remove body on updates
authorFlorian Müllner <fmuellner@gnome.org>
Tue, 17 Mar 2015 01:36:05 +0000 (02:36 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Tue, 17 Mar 2015 14:48:37 +0000 (15:48 +0100)
Passing null as body always meant clearing the existing one. While this
mattered less with the old message tray which used the expanded actor,
the new message list in the calendar uses the unexpanded body. We clearly
don't want that to disappear on icon changes, so pass the existing one.

https://bugzilla.gnome.org/show_bug.cgi?id=746343

js/ui/components/telepathyClient.js

index d552488b83b762ad73cdd21dbca75059542aba5d..ddcddfe4b0e17256e3679334782f2a4cf76505bb 100644 (file)
@@ -352,7 +352,9 @@ const ChatSource = new Lang.Class({
 
     _updateAvatarIcon: function() {
         this.iconUpdated();
-        this._notification.update(this._notification.title, null, { customContent: true });
+        this._notification.update(this._notification.title,
+                                  this._notification.bannerBodyText,
+                                  { gicon: this.getIcon(), customContent: true });
     },
 
     open: function() {
@@ -546,7 +548,9 @@ const ChatSource = new Lang.Class({
     },
 
     _presenceChanged: function (contact, presence, status, message) {
-        this._notification.update(this._notification.title, null, { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
+        this._notification.update(this._notification.title,
+                                  this._notification.bannerBodyText,
+                                  { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
     },
 
     _pendingRemoved: function(channel, message) {